Merge remote-tracking branch 'origin/master' into feature/android

diff --cc doc/lispref/frames.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge